Added more specific logging