Extended Message Class
Merge branch 'origin/gateway'