Added More in HTML & Mapping