Move some stuff to depends