updated methods to user new tables
updated schema