Fixes #16 - Support Extractors