Added new entities and shit