Updated models and user stories