Updated with user credential store and diagnostic method