Added base helper methods to factory