revert to simpler dispatch table pattern