Fixed previous commit. (Added unit of work pattern)