Big refactor
Added non-string indexed fields (not supported in C*)
Removed commented dead code