[WIP] Incorporate changes from recent library additions

This WIP PR tries to catch up with the latest service additions made by @adrienbrault