Added script handler classes