Updated macros en utilities to newest versions