ARQ-1824 Support for new Target format