Add extractors maps... and fix compile.