added mapper parsing