Removed Unit of Work Pattern and added UI features