Feature/refactor features reply