Added mapper_type attribute