Refactored Create Api