Prepping for unified api