Fix the entity MDA and utils method.