Basic macro-processing now supported