Updated database again and fixed the fields relation