Services now consistent across documents/apis