Moved to non-static UoW