Factory interface refactoring for consistency.