added new entities and utils