Some tweaks to the external interface