Updated with new #extensionize functionality