Move common stuff into common scenerios