Some modification for easier switching between model types.