Added core lib and search function