Enhance edify script generator

Change-Id: I1c48ff42e49c1c5e0ae9dba4c9bd3534cab545ac