Refactored create.