Improve interface a little bit