updated model to coincide with new class structure in djwailer