added db and misc