refactor feature sets