Adding new policies for stub/skeleton generation - second benchmark