Improve assets loading