Added Classes and Properties for the classes