Fixed circular dependency in require