Removed unneeded dependency to ExtendSelector