Modified code generator logic
Complete Simple User scenario