Now assumes version 1 unless specified otherwise