Modernise defaults/actions handling by wrapping these in functions