Updated Common plugin