Added Entity Classes