JBTM-2163 Update to add the import packages