Moved extensions to Common