Added Cloud API, added some consistency around service builders.