Refactor method interface