Database changes

Look at the commits