Adjusted to new ModelCC interface