Adding remainder of db classes