Updated log_mapper