Added External Location and Transcript Location to mapping file
Fixed compile bugs in multi-object support