API tweaks and updates