Updated Variables to include all generated objects