Refactor create performance