Database and Table classes added