Added Set and HashSet containers, and removed most std containers