Fixed circular dependency in container