Refactored css selector integration, make it context aware