Scripts improvements