Adding support for local pickup