Updated entities and comuni modules