More tweaks for controller model obejct.