More API changes; it's kind of like a hybrid between version 0.9 and 0.10.