Refactoring interface

continuando merge