Move common stuff out