Change database structure - refs #7402