Even more selectors moved out from the Core