Updating to remove Base64 dep