Modified class Common.