Added Canonical Values enums
Added ComplexField class