classes update after db refactor