Removed the dependency with the Credentials library