Added scripts support