Apollo macros added
Minor changes