Completed add and find functions