Added DataMapper.finalize