Removed CSS Selector dependency