Added diodon and diodon-plugins