Further changes to Sync and MaidManager Service.