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