Removed dependency on extender