Add submodel support