Refactor create method