Finish models and api