Add preliminary support for model selection for multiple terms