Services now saves and loads correctly