Warranty Service refactored, Warranty Repository as well