Storyboard upgrade met classes