[psdcontentbuilder] Review changes