Schema generator addin, replacing the old macro