Working for collections also.
Added statement type
Set proper column line for the Referenced variables