Extended ElementHandler, Updated Regex