Added UpToSet, moved set helpers