Entity creation refactoring (unwrapper's validation)