Removed Base64 dependency