Add more DB work