Supporting more servers

Supporting more servers as iCloud is already on 9.