Added hightlight and history modules