[dannunzio] Started refactoring lock to SRP