Updated storate and search function