WIP: initial db changes for vamps