[IMP] Code refactoring: interface, parameters