JASCIS-87: Fix imports