Refactor interface / fix parameters