Added capability for master slave setup