Feature/refactor preloading contacts