Master server API update, fixed deadlock