Updated Auto complete