Handle object oriented js blocks better
update requirements