Database initial commit 2.0