First pass for www api support