Refactor UOW