Updated Generic Function scenarios. Few maintainance changes