Added entities and useful