Feature/voa db changes