Support add and find

Tests included