Added entities and their handlers