Add Id property and logging.