Added a couple specialization points