Adding propper logging