[CUR-324] Improvement refactor usage