Tweaks to the API :D