First commit for datbase implementation