Add missing message handlers in handleMessage