improved runtime macros