Changes to reflect base64 handling of modules