Tweaks to attribute API