moved store related functions to own class