Fix typo and add new method in mapper class