Added annotated factory