more api v2 improvements