Improve initial keys propagation