Updates to API in preparation for using symbol manager for model (#5481)