Formatting and adding mapping