Refactored handling of the pandas store