Added metal shortcuts and ion fractions