Adding support for artax #16