Enhance edify script generator

Change-Id: I4d87c748ffa92dff28adfb5dfe01f71a4f931945