Review Request 45: Improve asset management