Update core options to v2 format