Begin to implement variable mapping