GH21 - Separated the listener logic from the conversion for server logic