Individual client and database handler classes added