Made supported types internal
Selecting just the supported types
Added property ignore support

And some refactoring