Cleaned up database and add default class