added more macros to make config more readable and updated config accordingly