Added Classes and Database mapping