Improve user data message regexp