Upgrading ATIGA into a modern Agreement