Message verbosity and macro structure

Add wrappers for logging messages and change macors structure in db and cmd files.