Refactoring to a consistent interface