Improving the interfaces here and there.