Adding vector support