Improving Max interface.