Updated code to use the name 'table' instead of macros.