Sms parsing improved