Modified for make it downgrade compitible_changes added for options