Generic and Miniboxed macros implementation added