XA template stuff, and support basic AWS templates