Host object updated & minor fix in the collection mapper.