Update default.xml

Complete re-do to be inline with PA legacy branch