An Improved Signal Model for Axion Dark Matter Searches