More additions to generation script