Update to match API

Final update that uses XML settings