Update factory to support alternative schema drop query