Some changes to make the tool backwards compatible.