Added WKT support