Refactoring RPX message structure