Sorry for late noticing. I have removed those stuff and also mark the methods in Mapper deprecated