Partial commit: Object Factory