Improve logger system