[WIP] Add synchronization for other services