DB management no longer hardcoded