adding analysis classes and compiled macros