Updated to support Apache BASE64 En/Decoder