Work on reintegrating extendify 1.1