Added Set class; added xml and raw properties