Changes to Managedb module code