Use the new bundle interface