Added remainder of extensions