Removed custom encoder in favor of new Base64 encoder