Working on database improvements