Mapper Comments Update