fixup! port models and methods to api 8.0
fixup! port models and methods to api 8.0