added better support for storyboard