Refactoring features list