Added finalize on DataMapper, without this it stopped working