Use INFO macro in more places