Model-related types operational after recent changes