Some changes for vector