Changes to use Slave instance

Changes to use Slave instance