Fix block management in JS / Clean request , responses classes