Changes to reflect Suite 4 changes