Fix getModel() visibility and arguments