add handling of core modules