Update notes for submitted changes

* Move api_class options to where they are used