Actually update defects.  Added ModelMapper class.