narrowing scope passed to store handlers