Use interface
Remove redundent class