feat: changed models according to latest architecture changes