better configuration for connect & watch