Updates based on DB schema