Added plugins from old Waldo package