Simplified DB handling and included node modules