Added basic splitting of selectors