replaced module declaration macros
replaced module declaration macros