A few ss3 updates

updated DataObjectDecorator and CMS fields to SS3 way