Added a dedicated module for macros.