support for motor and pulsar servers, thanks Niphlod