Fix #498 and support more STL clases