Expanded the number of supported ions.

Change-Id: I66f45aea38a4b132cec8f4f955b35135aadda6d3