Changed Code Geneartion .java style
Added more query options
EffectiveBy
RowLimit
SortOrder