BROKEN: Rework for the asset/resource management