Added more code macros.