Sanitized the code
Add MessageUnpacker configuration