Credentials Refactor