Credential Loader added, cleanup