Refactored to UnitOfWork pattern and smaller components
Bumped version