Move more stuff to common