Support new server attribute names