Refactored message definitions