Changes as requested for SupportCenterPlus module