Better add/update/search behaviour