Removed extractors. Added Mapping and Proc.