TASK 10: final changes to database classifier/type