Use WKT all across the board for consistency