Adapted to auxiliary modules structure