Add refactoring and user stories