Improve interfaces.