Removed evaluations & changed database schema