Update to use event services
Handle modules better in migrations