Updated to use new database structure and a few strict method fixes