Adding support for local mode