add GetNext support