port models and method to api 8.0
add tests