Added better logger