changes: make location an extension of type descriptor and have an additional mapping...