Adding some more stuff and moving to search API