Add block and logging macros;