Removed possible circular dependency