Added support for manual current range selection