Refactor driver feature-macro generation to be driven by existing tables