more work on Services API