Refactor features - more responsive