Started fixing module entity changes, second round