Added cake batter model + various model updates