Added Entity and more