Updated SLD parser