Update to 5.0.0 and new macros