Add the Unsafe option and namechange for method