Analytics Data Service Impl. Update. Refactoring locks implementation