Adding site awareness to CLI mode