added more basic store support