added more info/context in logging