Added attributes for customising mapping