Add assert and logging macros