added Handler handles and cleaned up event handle signatures