Adding more support code for lynix/aerotools-ng#27