Database changes
Updated code