MapFunction support added