Feature/syncdb adapt