Reworked usage of Resource and assets