Changed list to vector containers