added security, search and debug