Added fields to database model including isClass boolean and org. field