Added some store improvements, essentially refactoring