Updated lib to include prefix autocompletion