Use native types instead variants
Fix for D2007
Fix for D5
Merge pull request #32 from alexeyvo/native_instead_variant

Use native types instead variants