Added simple macro framework