Refactoring and prototype for AMQParty