Slight changes to work with the overhauled ListModels