Moved MessageCenter to separate module