Added handlers to exported classes