First round of adding the whole model of Api