Support Generation improvements