Resolved circular dependency