Updated Database Structure and added new Classes