Updated components to use the standard futures