Update towards V2/3

Updated Database towards some vital things