Refactor to support both
Refactor to support both