Database changes
Minor changes