Added auto-complete extender