Feature performance refactor