Updated common plugin