Feature/syncdb adapt 3