Moved current_store into store concern.