Added unit of work classes