Removed hardcoded message field