Added allow-none conversion