JBTM-1999 Updated to use the blacktie subsystem from the zip