Added initial database management