Extension improvements