split out advanced modules from basic api