Added AAD and updated storyboard per requirements