More robust service management