Refine the macro management system and make it more informed and organized

Signed-off-by: MHesham <mhesham.fcis@gmail.com>