PSTWO-407 - added locking service