Tweaks for the new information model