Continue work on options - new Mapper