Add typed bundle wrapper to arguments, really need to fix that :(