added the possible extra tags and updated the deprecated api calls