Add in generic name and import from web support