Added more comments in mappers