Pre-process DB revamp