DB setup file + class modifications