More work on auto texture loading