InnerModel API improvements.