Couple more extension points that I forgot to include