Tweaked the DB reverse engineering