Mapper class improvements
Fix #87 (feeds with unknown objects)