Refactoring: Added VatService and VatHandler classes