Added more classes to be persisted in the db