Made minor modifications and added initial dbstructure