Added class
refactor
new class