added a model and changed handler accordingly