Make mapper to be final