included new classes for db