Move macros inside of core