Move some things to common