Mostly interface improvement.