Added modifications to scripts and samples