Added entities and modified shapes