new handling of annex/default annex objects after Meta model change.