More Message refactoring
Various improvements