Moved extensions into common