Improving Flexibility and Performance in Metric-Based Few-Shot Classification