Fix #23: Merge command/event map configuration