Refactored YAML entity creation to use a two-phase approach (create, init)