Added paint support