Refactor deferred creation