Removing circular dependency