added macros and packages