Restructured command handler flow.