Changed static text to message properties