Feature application refactor

Feature application refactor