Refactored unit of work, updated change log