Corrected mapper class