SizeTag and Map changes for #96

still need to do NVP