Classes and database changes for user/developer and tester