Improve VLR handling and Pulse and Waves load process