Updated for namm format in webservices + new schema and various fixes