This should really keep asset associations

Hopefully.