Added utility files and fixed VAF collecting