add First Paint support