Moved some stuff to iop header