Add storyboard support