update to handle database schema issues