Update for Komodo 8