Changes for setItemAtPosition