Macrosyntax updated in class.