Added NSSet support