Interim checkin of new tags API