Updated Entities with fixtures and modules