Further work on more flexible texture handling