Simplify multiple stl support