A few follow-on changes for InputSchema and new HyperParams