Updated Drive source pattern