Changed organization to scalastuff
Support up to 22 fields in product