Improve assets loading (add helpers)