Added enable/disable_messages