Small API changes