Remove store from count function. Will be moved to separate one in future