Credentials Handling Update