Working GMS part with the new api