WCMS-250 General updates