Adding a map for SpecSelector, bug is suspected..., for the other codes minor changes