Updated storyboard & usecases