Changes to make extension easier.