Improved interfaces.