Improved Analytical Model for Propelled and Unpropelled Hypersonic Vehicles