Improved Message extensability.