Updated to include reports-store-gateway-support annotations for on the
fly template generation.