Refactored create and init actions