Improve extact scripts