Add HarvardMapper and update BPLMapper