Changes to mapper class.