Move some stuff to the genric layer