Add bzip2 support