Improve integration with storyboards.wq