Searching and storage added