Issue25 - Adding decorator to show previously mapped fields