Improved Service settings