Improve texturing support