Updated Database and added few new classes
Merge origin/master