Refactor and break interface. See CHANGES in POD.