Feature refactors with context aware view