Updated JavaScript for New Modules