Refactored all features.