Removed model circular dependencies with registry