Improve slave setup