Removed STL dependency