Refactored scripts
Improved retrieving and bench scripts