Update to include auxilary data as well