Added NetApp class, Updated AWS class to Amazon