Numerous API changes