Added more to the master/slave api implementation.