Added Client API and LockService