Update core to wait for dom