added more macro and http server logic