Added increased logging capabilities