Implement reasonable retry and timeout policy
Add message resources