Making the master configurable