Changes for setting up EMMS