ENYO-690: Support for apx units, add command line switch.