Small API changes to better suit the future work.