Revamp command handler