Rename option name
Use Push step instead of using Storage directly