Consistent storyboard support