Moved utils functions/structs to separate file
Added store search method