Better texture handling