Added create and search facility along with tests