Added support for additional archive formats