New level and better polyline support