BasicMapper added