Added log and map handling