Added range and etseq handling