Reflect current API interface (soon to change hopefully)