Delay load

Final handling of delayed map load