Add the possibility for option macros and start using it to indicate