Tweak API to add type, raw name