Added message order guarantee and retry mechanism