Added a lot of classes to handle Entities