Further update to DIY on JS structure