Refactoring, added nested typedef for STL type