Updated common export