- standardize wrap and unwrap methods