Added version support and separated info and history