Small changes to API (backwards compatible)