Adding fast lookup and additional error management