Added credential handling as requested by Meservy