Refactored entity management, added URN generation placeholders.