Changes for std::vector removal from api