Interfaces has been added
Refactoring has been done