Updated ASSETS loader