Tweaks to new API