[Core] use new macros in core