Refactor burst loading