Update with more uses and user stories