Rewrote collection to accommodate with the new UOW.