Improved overall texture handling