Additional work on the Master Server