Added logging capabilities