minor API changes for more consistency