Started to separate ActivityFeature