Add SchemaSelector class