Slight improvement to \Controller\Base