Add CRUD trait
Add switch to use custom search API