Enhanced beam management for a wireless communication system is provided. In one example, a method comprises: receiving, from a mobile device, a message indicating first beam information for a selected first beam of beams associated with the base station device, wherein the message is a first received message of a random access channel procedure; and receiving, from the mobile device, message indicating second beam information for a selected second beam of the beams associated with the base station device, wherein the selected second beam is an alternative to the selected first beam for transmission of downlink data to the mobile device from the base station device, and wherein the second beam is indicated in the first message of a two-step random access channel procedure. Methods of signaling the second beam and/or transmission diversity approaches employing the first beam and/or the second beam are described.