User stories refactoring
Non-functional requirement stories added