Update model to use inf-extension
Minor cleanup