Fix for selector when there are multiple classes
Add selectors
Add selectors
Handle externally-provided name