Added Komodo 6 support