Improve interface again.