Fixed integration with Storyboard, fixed Lookup