Started fixing module entity changes, third round