Started fixing module entity changes