Move meta variables into mapper