Updated README and simplified extractors