Updated supertags and wpapi