Updated extend to use the new extend class