Added Set support