Added None to partial vars