Some tweaks to API