Refactor so shardPaths and shardPathsIncludingCustom are the same