refactored message spaces