Change to new argtypes