Refactoring
Made extends placeholder selectors