Updated to new ModelCC interface