Small mapping updates

Further experimenting with XML mapping