added support for alternative on-disk formats