Added support to new cms ui module