Adding module/session properties to export and adding spinner