Add Clirr plugin + fix backward compatibility issues.