Added dbfiles and several updates