Adding amarillo mapping