Logger module refactored little bit.. - to check..