adjusting classes to new schema