Feature/do not wait for initial sync