Changes for ModelController debugging