Add proper support for manual current settings