refactor to use model API