Refactoring to simple interface