Refactoring: Added an interface