Added decorator, fixed message.proeprties