Some updates to use AWS S3 module URL function