Added Entity classes