Added gen code for va and id