Add locations and all/none support to data section