Some changes made for Actions and Model