More API changes; feels more natural