Update draft + test, redefined db relation too.