Brought API in line with core.