Added metadata namespace in mapping