Adding some more set stuff