version bump
remove factory pattern usage