Improve SDF parser