Schema generator addin instead of the macro