Make services optional