Update server name
Add final classifier