Add updated functionality