Refactor application interface