changes to work with new core and modules